Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dell-replication-controller-config reconcile reset issue #755

Closed
wants to merge 12 commits into from

Conversation

nitesh3108
Copy link
Contributor

@nitesh3108 nitesh3108 commented Oct 21, 2024

Closing due to rebase-error.

See PR #760

Description

Configmap (dell-replication-controller-config) is installed as part of the controller.yaml with empty values for clusterId and targets. Once we inject the cluster details using repctl cluster inject, the configmap is updated with the correct information. However, during the csm-operator reconcile loop, the configmap is getting reset, resulting in resetting the configmap.

GitHub Issues

List the GitHub issues impacted by this PR:

GitHub Issue #
dell/csm#1531

Checklist:

  • I have performed a self-review of my own code to ensure there are no formatting, vetting, linting, or security issues
  • I have verified that new and existing unit tests pass locally with my changes
  • I have not allowed coverage numbers to degenerate
  • I have maintained at least 90% code coverage
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • I have maintained backward compatibility

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also list any relevant details for your test configuration

  • Ran Replication e2e tests against powerscale driver and its successfully.
  • configmap once generated doesn't get overwritten with operator reconcile logic anymore.

@@ -116,6 +116,7 @@ func getDaemonSetStatus(ctx context.Context, instance *csmv1.ContainerStorageMod
}

for _, cluster := range clusterClients {
totalRunning = 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this totalRunning=0 do? Were we not resetting the count on each iteration of this for loop and needed to be? It doesn't seem related to other code changes in this PR, so it could just be an unrelated fix.

@ChristianAtDell
Copy link
Contributor

All checks pass (though I don't know how to fully interpret the Run yamllint step as completed other than it taking 18 seconds to run) and the code looks good to me.
image

However, Operator E2E tests have not been run on an image generated by these code changes, and I don't think such an E2E test will pass given the main branch is currently failing due to quay.io changes-in-progress.

@ChristianAtDell
Copy link
Contributor

image
A merge was made that didn't get signed when I ran a git pull to get latest changes-- my bad. Do you know of any way to sign that commit after-the-fact? Or do we need to do a rebase? All commits must be signed to merge into main on this repository. @nitesh3108

suryagupta4 and others added 8 commits October 22, 2024 12:38
* feature/pmax-minimal-sample-e2e

* indentation fix

* yamllint fixes

* quay.io updates and some cleanup

* yamllint fixes

* add replica count

* add csipowermax-reverseproxy

* yamllint fixes

* added replication scenarios for powermax

---------

Co-authored-by: Harish P <[email protected]>
* Add Ut for HasModuleComponent & AddModuleComponent

* Refactor code and add UT for LoadDefaultComponents

* Refactor code and add more test cases

* Refactor code and add more test cases

* Fix error reported by golangci-lint
* Removed latest version fetching through a function

* updated replication controller image to quayio

* quay image updates

* removed dead code
… nginx image (#747)

* update nginxinc/nginx-unprivileged image

* add coordination.k8s.io access for observability

* bump trivy-action
* point latest images to quay.io

* point latest images to quay.io-tests folder

* point latest images to quay.io-tests folder

---------

Co-authored-by: Harish P <[email protected]>
Co-authored-by: Harish P <[email protected]>
* E2E tests for PMax driver in minimal manifest file Auth v1

Signed-off-by: meghana_gm <[email protected]>

* add powermax auth v2 testfile

* remove line

---------

Signed-off-by: meghana_gm <[email protected]>
Co-authored-by: Aaron Tye <[email protected]>
@ChristianAtDell
Copy link
Contributor

Effort has been cherry-picked to PR #760 because of a failure to sign a merge commit and a rebase error.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants